Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:48:18 +0000 (17:48 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:48:18 +0000 (17:48 +0200)
commit73e7115e17dd39babf61b16833052acb9902784b
tree78da591332b4a53c6524e5dc4cf7616afe2a1e7d
parent0516a23ad30e762b4e60c3b9da8a8229dc0bf6e0
parent8a12e342f50872717d0299e7dd27e2c91b621d36
Merge branch 'upstream'